Merge "Update emulator to EMU7.240418.003" into main