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

Change-Id: If13799bd7bde4a39744c355c1766e602cb9e7de9