Merge "Polish Configuration activity" into sc-dev