Merge "Improve touch target for the gear beneath a notification" into nyc-dev