Merge "Don't set animation pending when gaining fake control" into tm-dev