RA-497: Turn Edit Patient Demographics and Edit Contact Info into extension points