Merge "Refactor rd loop for chroma components"