Merge "Unhide FLAG_SUPPORT_EJECT and related methods."