Merge "Keep notifications with active remote inputs" into nyc-dev