Merge "Migrate REST_TO_UNLOCK flag to aconfig" into main