Merge "Display: Fix color issue when splash screen is enabled"