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

This reverts commit de7b03b2466bd200a026ef81d6550c747d57aec9.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the joy_listener sub directory