Merge "Only fade clock away at the top of the screen" into pi-dev