Merge "Create flag for implementing onDynamicSensorDisconnected" into main