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

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