Merge "Add DISABLE_CLOCK flags to status bar, fix transitions" into pi-dev am: 02327e4080
am: 88d828a68f

Change-Id: I2858092206fdf1c875db46509ee098505064ce90