Merge "Merge "Avoid infinite pending MSG_CHECK_IDLE_STATES messages." into tm-dev am: c33e4ee334 am: 01af4da27a"