Merge "Put notification demotion behind flag"