Bring up changes to latest RomSwitcher