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

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