Merge "Make sure to double bold the text when enter bold mode" into udc-dev