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

This reverts commit 4fd3b67f9c9d4d9cdce16fd105115ebbd897ef8e.
Rebase from 'upstream'
Trimmed the branch to only the rosh_desktop sub directory