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

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