Merge "Remove duplicate binding of RowContentBindStage"