Merge "Workaround for the issue where a layout is not being triggered when rotating the screen while customizing. (3329988)" into honeycomb