Merge "Fix NPE in FolderPagedView" into udc-dev