Merge "Accessibility CTS tests fail on very small screens (cherry-pick)." into klp-dev