Merge "Revert "Release MIGRATE_LOCK_ICON flag."" into udc-qpr-dev