Merge "Use non-shadowed app icon" into sc-dev