Merge "HWComposer: Fix an fd leak on boot with HDMI"