Merge "Fix idle timer rule leakage"