Merge "Allow shell notification listener access toggling"