Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev