Merge "Attempts fixing DismissSplitScreenByDivider flakiness" into udc-qpr-dev