Merge "Unify intra mode mask into mode_skip_mask scheme"