Merge "qdutils: Refactor idletimeout fallback mechanism."