Revert "squashed: remove kitkat ui changes"

This reverts commit a1a2210ae4bd5bb0becd03a0f5e6e0b49336526e.

Change-Id: I73dffd8a37f2e9412099e03cf381f401e8e8e635