Merge "Update folder preview and folder colors" into udc-dev