Merge "Fixed jarring touch ripple effect when turning on/off battery saver from quick settings" into qt-dev
