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

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