Merge "Fix RS graphics samples/tests."