Merge "Prevent notifications from erroroneously bypassing 'repeat callers' filter" into nyc-mr1-dev