Merge "Animate the QS gear button click." into sc-dev