Merge "Fix the user profile icon." into oc-mr1-dev