Merge "Add idleTimer existence check before removing idleTimer"