Merge "Add flag for Tiny Taskbar" into main