Merge "Use DoubleShadowIconDrawable to draw shadow behind archived cloud icon" into main