Merge pull request #10533 from t895/adaptive-icon Android: Create adaptive icon and refactor old icon usage