Merging latest web_ui changes.

Review URL: https://chromiumcodereview.appspot.com//12386060