Merge "Move our Window flags handling closer to PhoneWindow DO NOT MERGE" into lmp-mr1-ub-dev