Merge "Add FolderSpec for responsive grid support" into udc-qpr-dev