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

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