Merge "Add comment for per-app preference priority" into main