Merge new iframe events & changes from feature/deep_link_cfi_resolve