Merge "Fill UI polish" into oc-dev
am: c9a83326c2

Change-Id: Iafae2e819d836a1bda463898695f2fbf9334299b