Merge "Sync surface position for legacy app transition animation" into tm-qpr-dev