Merge "Remove OEM_UNLOCK_PROP usage" into main