[CP Staging] Revert "[Travel] [Refactor] Create a new shared component for AddressPage"#42697