Merge "Improve interaction around showing / hiding the gear behind notifications" into nyc-dev