Merge "Fix bug in sb8x8 partition context" into experimental