Merge "Make AdaptiveIcon support different inset"