Merge "Improve "does not support current theme" exception" into lmp-mr1-ub-dev