Merge "Fix boot crash on devices defaulting to landscape."