Merge "Accessibility shortcut secondary action - fix magnification triple tap logic"