Merge "Fix content description for notification icons" into nyc-dev