Merge "Fix large text setting for QS" into lmp-dev