fixup!: Merge branch 'stable-3.2' into stable-3.3

Cleanup the UI code which was not done in the previous
merge commit. Delete the html files and port all changes
to *_html.js files.

Change-Id: I1cbb7054b262167f1a908a6ed90f5cbf46e7714c