Merge "Correcting permission check for App UIDs listing" into main