Merge "Update location icons (qs + status)" into pi-dev