Merge "Check for view measurement before animating" into tm-qpr-dev