Merge "Modify PhoneWindowManager to avoid interfering with current user's experience" into main