options bar ui fixes

bug: 13331173
bug: 13330727
Change-Id: I270fd04feeb8f6a4db6fae21184fad150be5fcbe
4 files changed