Move more of the system bar to the layout.

Change-Id: I2fd67e687b8048a48e2c6531ac896d33815ce615
2 files changed