am dc6cba4e: am fa45a1eb: am a627878c: am 7608c913: Merge "Remove app icon from preferences" into ub-gmail-ur14-dev

* commit 'dc6cba4e5e3659fd342171ddd612e28cca1bd951':
  Remove app icon from preferences