am 228b706d: Merge "Preventing scrolling of workspace when in customize" into honeycomb

* commit '228b706daf483dce3954759958ae76ef39aef34c':
  Preventing scrolling of workspace when in customize