Merge "Modify non-rd intra mode checking"