Merge "Mark addWindowTargetLocked as const"