Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev