am aefe8e4d: am 93ed9858: am 63c4a718: Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev

* commit 'aefe8e4d75415df97b2937684c06c2bb6310cd98':
  Reland "Fixed constant window switching on lock screen..."