Merge "Don't always set the clock to View.GONE" into pi-dev