Merge pull request #7068 from illume/upstream-0070-aks-desktop-config-dir