Merge "ui: Remove text_top_." am: 568644197f
am: d96ce15139

Change-Id: I005f49442b63fafe5642a6e416c176361d0beff0