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

* commit 'd59ce1f4e33cdc87af960ed3b35d0cf39afc00ff':
  Add timeout if we dont get onEnterAnimationComplete