Merge "Fix splitscreen test: SnapToDismiss" into tm-qpr-dev