Merge "Fixes an issue where certain notification icons were not tinted"