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