Merge "Move notification listener management into helper."