am 6f5bbc1b: am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev

* commit '6f5bbc1b1e73b3559e311ea2e59a2281b67f65ca':
  Add timeout if we dont get onEnterAnimationComplete