Merge "Turning on hardware layers for the workspace" into honeycomb