Merge "Start cleaning up percentage formatting in Settings." into lmp-dev