Merge "Ensure final height of UMO transition is the hostView's height" into tm-qpr-dev