Merge "Don't allow very short GF groups even when the GF is predicted from an ARF."