Merge "Work on settings launch speed"