Merge "hwc: Donot rely on previous comp type to trigger idlefallback"