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