Merge "Prevent non-system overlays from showing over notification listener consent dialog"