am 6cff6cb7: am 5c82b912: am c6817322: am 4e83dce2: Merge "Update Mail Shortcut Again and Move Icons (UnifiedEmail)" into ub-gmail-ur14-dev

* commit '6cff6cb782f292c7ef5caf7a34d026953ea21c34':
  Update Mail Shortcut Again and Move Icons (UnifiedEmail)