Merge "Fix potential divide by zero in display_html"
am: 524311b26d

Change-Id: Icaabb9e66548222d98208302837af58af1d9bea9