Merge "Update activity_recognition and body_sensors permission icon"