Merge "Status bar icons 15 dp" into pi-dev am: 97abc762cc
am: 4811db16a5

Change-Id: I75f145a1cd7445674964e0e7b1127290df3bad87