Merge branch 'master' into 'material-spec'
# Conflicts: # app/src/main/res/layout-land/fragment_notification_dialog.xml # app/src/main/res/layout/fragment_notification_dialog.xml
# Conflicts: # app/src/main/res/layout-land/fragment_notification_dialog.xml # app/src/main/res/layout/fragment_notification_dialog.xml