Merge "Avoid alarm lock when calling outside" into tm-dev