Merge "Prevent multiple calls to handleOnDialogAnimatedIn." into tm-dev