am 79568720: Merge "Fixing issue where folder icon shows holographic outline."

* commit '79568720bfb745c5c136d4fbb5031a0b7e2e95ea':
  Fixing issue where folder icon shows holographic outline.