Merge "Enable taskbar on phones when the flag is turned on" into main