Merge "Make settings cog animate back to original button" into main