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

Change-Id: I8f7c3a0069309d95c8f4dc0e9d1c4189cdcb59f1