Merge "Composer hal changes for boot time display mode"