Merge "Fix right-most navbar icon tinting mismatch" into pi-dev am: 78e805684b
am: 5bbbbfd57c

Change-Id: I931a77d77780c7da0d3e01d0cc99312348943961