Merge "Enable Notifications on AndroidTV" into pi-dev