Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev