Merge "Fix NPE in DialogLaunchAnimator" into tm-qpr-dev