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

Change-Id: I86c112f43556ca1dc345c0c36610a367a327bc18