Merge "Add Wifi Wake notification ids to system messages"