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

This reverts commit 69da7780aad10c52df14b90066d0d3a1bbef4cd0.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the strands_desktop sub directory