Merge "Make DialogLaunchAnimator.showFromDialog more lenient" into tm-qpr-dev