Merge "Add null check for NPE in FolderIcon." into tm-qpr-dev