Merge changes from topic 'am-fb051ec5-6588-4efd-bc26-64a4a4fdf903' into ub-launcher3-master

* changes:
  Minor polishment on app discovery UI. am: 0287a44c81
  Minor polishment on app discovery UI.