Merge "Fix mismatching surfaces position when entering split with two intents" into udc-qpr-dev