Merge "Fix accessibility navigation on search bar selection" into udc-qpr-dev