Merge "resourceloader: Minor documentation and coding style improvements"