Merge "Adding feature flag to enable new external proximity sensor API" into main