Merge "Enable desktop_taskbar_on_freeform_displays in dev opts" into main