Merge "Bring back new navigation screen event logging."