Merge "Network notifications: revamp keying scheme"