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

* commit '5bd836aac3b7602a4166bc836aaa33ccc7107d74':
  Add timeout if we dont get onEnterAnimationComplete