Merge "further clean-ups on intra4x4 coding" into experimental