Merge "Simplifying settings activity" into main