Merge "Rework non-RD mode decision coding flow"