Merge "Fix unable finish booting when display added before boot"