Merge "Notification MessagingStyle: Add handset views" into nyc-dev