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

* commit '8a097659d86213ad3619dbf7cf8f10ab49fa05c4':
  Turning on hardware layers for the workspace