Merge "Add timestamp to ActivityOptions.OnAnimation*Listener" into tm-dev