Merge "Revert "Add flag for Tiny Taskbar"" into main