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

* commit '35ae2183787921eab83f0958d129a98f09db8027':
  Workaround for the issue where a layout is not being triggered when rotating the screen while customizing. (3329988)