Merge "Shows navbar in SUW if the a11y button is requested" into oc-dev