Merge "Guard taskbar / navbar unification logic with whether the device is a phone on top of the flag" into main