Merge "Add flag to enable taskbar on phones" into main