Merge "Status bar etc dots 4dp" into pi-dev
am: d54c3a3036

Change-Id: I49514e9213e36ff5d3138c0b352af4be9b370282