am 20382a3f: am 8a097659: Merge "Turning on hardware layers for the workspace" into honeycomb

* commit '20382a3fafc44f32c29c5955d765ddec070c5cf1':
  Turning on hardware layers for the workspace