Merge "SF: Do not toggle idle timer on display hotplug" into main