Fixed webui cleanup issue

Change-Id: I5eacdb193c3863a932eafeee779a1aad5b58d9fe
Merge "Fixed webui cleanup issue"