Merge changes I1c8b5638,Id9b2c57a

* changes:
  Make equality check more robust for a11y button
  Ensure nav bar contrast under magnification