Merge "Fix the font size selection for recovery mode"