Merge "Improve A11yNodeInfo visibility for magnification"