am d21c07cf: am 7eac9132: Merge "Mirror label/folder icons" into ub-gmail-ur14-dev

* commit 'd21c07cfc1f4fce54fb4a1e538f4e56a30a911a0':
  Mirror label/folder icons