am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"

* commit '083c1d7f7d0fad8ee071622caf15f02a1fcdd4b3':
  Fix the font size selection for recovery mode