am 56606fdf: Merge "Improve "does not support current theme" exception" into lmp-mr1-ub-dev

* commit '56606fdfdbdf57b691d76a0234b83e6a3788069f':
  Improve "does not support current theme" exception