Merge "Fix spring loaded scale when taskbar is present" into sc-dev