Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev