Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev