Merge "Default icon should match platform one even on N and below devices. Bug: 63083094" into ub-launcher3-dorval-polish