Remove no-longer-supported key from manifest
Merge remote-tracking branch 'upstream/master' into small-fixes-3
Better icon for selecting root folder in Settings
Remove no-longer-supported key from manifest (reverted from commit 61c3a8deaba840296349536d4c850aa2ed04523b)
Merge pull request #3004 from ussuri/small-fixes-3

Better icon for selecting root directory in Settings