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

Change-Id: I8f96d17f637b10c5e4949bf22f6ca12a269bf8a1