Merge "Accessibility fixes and updates" into ub-launcher3-calgary