Merge "Update registerOffloadEngine() permission check" into main