Revert "Trimmed the branch to only the strands_desktop sub directory"

This reverts commit 6b07fd16acf0301a6e2fe64cae9e526f709d7333.
Rebase from 'upstream'
Trimmed the branch to only the strands_desktop sub directory