Merge "Cleanup of the flag ONE_WAY_HAPTICS_API_MIGRATION on CentralSurfacesCommandQueueCallbacks" into main