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

* commit '7eac9132253385088ca359eaa6829a1123f23ab4':
  Mirror label/folder icons