Merge "Accessibility toggle button small tappable area fix" into tm-qpr-dev