Merge "refactor(qemu): console runtime switch on bl31 exit" into integration