am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '1f33bdad98dd5138f887642d39c9495e1d7df14b':
  Fix for shadows on theme editor