[automerger skipped] Merge "fix overlay on status bar because of two clock" into pi-dev am: 0317b241d8
am: 904c4d1c4f  -s ours

Change-Id: I615e16de8479ddd10835dc6ff7ea59b4c49d50fc