Merge "Revert Nav bar contrast under magnification" into pi-dev