Merge "Fix responsive folders" into udc-qpr-dev