Merge "Add tint for flashlight icon"