Merge "Fix bottom split disappeared after unlock" into udc-dev