Merge "Fix/suppress renderthread google-explicit-constructor warnings"