Merge "Add DISABLE_CLOCK flags to status bar, fix transitions" into pi-dev