Merge "[DO NOT MERGE] Magnify status bar" into pi-dev
am: e649106c74

Change-Id: I20d3593f5d9b93997c5dc908c58a51ec62669ff6