Merge "Toast app icon display is inconsistent for system apps"