Merge "Add content description for gear behind notifications" into nyc-dev