Merge "Fix a CalledFromWrongThreadException" into tm-dev