Merge "Don't dismiss split during enter if already visible" into udc-dev