Merge "Create settings activity layout with explicit toolbar" into sc-dev