Merge "Add the screen when there's no create option for the default provider but there's remoteEntry"