Merge "Fix RS graphics samples."