Merge "Support passing multiple res folders" into tm-qpr-dev