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

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