Merge "Status bar icons 15 dp" into pi-dev