Merge "Fixed a Settings dialog crash." into lmp-dev