Merge "Improve Settings launch performance"