Merge "ResourceLoaderOOUIModule: Minor code quality fixes, and more comments"