Merge "Fix user education placement" into sc-v2-dev