am 1b89ad48: Merge "DO NOT MERGE Fix bug where folder was almost transparent" into jb-mr2-dev

* commit '1b89ad48536bc247d9611d374f733611cb8eaf13':
  DO NOT MERGE Fix bug where folder was almost transparent