Merge changes Ic53c42ec,I91e3591c into main

* changes:
  Update illustrations in private space setup and settings
  Change to add temp GAIA education screen and swap account and lock flow