Merge "Fix for shadows on theme editor" into lmp-mr1-dev