Merge "Merge "Fix bottom split disappeared after unlock" into udc-dev am: 2940bd78b9 am: 9274a91431"