Merge "Add ACTION_EPHEMERAL_RESOLVER_SETTINGS"