Previously the WM was taking care of this. Fixes: 35588318 Fixes: 34888808 Test: Manual Change-Id: I8b48d89f830bbef43b0132d191b29552e9c35702
Previously the WM was taking care of this. Fixes: 35588318 Fixes: 34888808 Test: Manual Change-Id: I8b48d89f830bbef43b0132d191b29552e9c35702