Merge "Remove the clock view when DISABLE_CLOCK is set" into pi-dev