Merge "Final cleanup of the flag ONE_WAY_HAPTICS_API_MIGRATION" into main