Merge "Add tint for location icon"