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

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