Merge "Simplify the skip flag cost code"