Merge "fix overlay on status bar because of two clock" into pi-dev
am: 0317b241d8

Change-Id: I31578280f1043338eae61c529a5b7a2a7a2cd024