Merge "fix overlay on status bar because of two clock" into pi-dev