Merge "Remove temp GAIA education screen from PS setup code" into main