Merge "Fix magnification button toggle off"