Merge "Reduce spacing between notification icons" into pi-dev