Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev