Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev