Make changes to migrate to Manifest v2