Merge "Fix a race condition that causes BackAnimation to be null." into tm-dev