Merge "Make WatchedItemQueryService depend on PermissionManager"