Merge "Fix DialogLaunchAnimation perf regression" into tm-qpr-dev