Merge "Preventing scrolling of workspace when in customize" into honeycomb