Merge "Assign 2nd ref frame in choose_partitioning"