Merge "Fix removal of optional settings tiles" into lmp-dev