Merge "Use the correct FGS View when animating into a dialog" into tm-qpr-dev