am 0e8291ce: (-s ours) am 1b89ad48: Merge "DO NOT MERGE Fix bug where folder was almost transparent" into jb-mr2-dev

* commit '0e8291ce313c73fdc9dde002136160f077e233f9':
  DO NOT MERGE Fix bug where folder was almost transparent