Merge "Introduce taskbar_phone_size" into main