Merge "Workaround for crash with null icon drawable" into main