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

* commit '73130c6a3a6cd93dbf2d19b1d517279f1bb83e73':
  Preventing scrolling of workspace when in customize