Merge "[ToA] New AppOp and permission" into main