Merge "Add metrics for taskbar 3 button nav" into tm-dev