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

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