Merge "Adding functionality to open by default settings dialog" into main