Remove comment from listen.xml layout
Merge a modified version of downstream project DroidVeggies notification code