Merge "Consistent names for intra mask flags."