Merge "Fix transparent view initial height" into tm-qpr-dev