Merge "fix rs_sample bugs in mirror and negative modes"