Merge "Fix PICK_MODE_CONTEXT index in non-RD coding mode"