Merge "Prevent crash with NPE in HardwareRenderer Bug #5109839"