Merge "Show 3 button nav on phone in Taskbar (1/2)" into tm-qpr-dev