Remove non-intrusive ui (Do Not Merge)

To test these need to be reverted

http://review.gummyrom.com/#/c/1168/
http://review.gummyrom.com/#/c/1165/
http://review.gummyrom.com/#/c/1166/

Change-Id: Ied27983123ae97cee915688a11bfe15b449ce333