Merge "hwc: Handle idle fallback in corner cases"