Merge "Update edit profiles screen" into sc-dev