Merge "Revert "Add READ_DROPBOX_DATA for Shell"" into main