Merge "Change the rule of picking UV mode in MBAnalyzeBestUVMode()"