Merge "Fix condition checking that scale of taskbar changes on hover." into main