Merge "Revert "Update app icon shadows"" into tm-dev