Merge "Correct error handling in getPreferredBootDisplayMode"