Merge "Follow migration of Shell app to DE storage."