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

Change-Id: I5308b3fc04ae8ea9b48d3e418218bd1ee74a0b1f