Merge "Remove STLState.snapToIdleIfClose()" into main