Merge "Catch ISE in ThemeOverlayManager." into qt-r1-dev
am: d7479146eb

Change-Id: Id54a17ceb27f8ffccd653ecf01df3debd091d47c