Merge "Prevent NPE in HardwareRenderer Bug #5169815"