Merge "Add noMoreOptions param to AppListPage" into udc-dev