Merge "Performance improvement for suggestion bolding." into froyo-ub-qsb