Merge "resourceloader: Refactor CSP $nonce passing"