Merge "fix an issue where SF would spin if /sys/power/wait_for_fb_xxx don't exist"