Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev