Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into udc-dev