am 6346fdd6: am 87e2982e: am 067c2607: am d21c07cf: am 7eac9132: Merge "Mirror label/folder icons" into ub-gmail-ur14-dev

* commit '6346fdd6dc1be5828f27d21a94bfda93763a5888':
  Mirror label/folder icons