Merge "Revert "Revert "Use system-api lib to get badged, shadowed icons(2/n)"""