Merge "Prevent loading of Icon resources from the wrong package" into tm-qpr-dev