Merge "Resetting widget cache when some configurations change" into qt-dev am: 5cb8996742
am: 7cf40fc0fe

Change-Id: I4d7fcfec9267ced3e596b1d706fbcb8b2a62e305