Merge "Add illustration to final screen in PS setup and update existing illustrations." into main