Merge "Fix cannot see "see more" button in UI" am: 2dbc2db581 am: 1fdadc1125
am: ed870944d0

Change-Id: I4f1b7e4fb426397f43da8438d703b2ad860e7dbc