Merge "Fix accessibility auto-scrolling in NSSL" into sc-qpr1-dev