Merge "Update location icons (qs + status)" into pi-dev
am: 478923bded

Change-Id: I524eb54f32c297de6a5eca1d4ed7f2f753adce3d