Merge "Avoid infinite pending MSG_CHECK_IDLE_STATES messages." into tm-dev