Merge \"Accessibility fixes and updates\" into ub-launcher3-calgary
am: 653bfcc743

Change-Id: I01037ccfa15faa44030d9aba878b3147bdcfacf7