Merge "Update user profile picker style" into sc-dev