Merge "Fix unable to toggle off Pause app activity" into tm-dev