Merge "Prevent views from changing size in animation" into tm-qpr-dev