Merge "Reduce Accessibility animation-wait timeout"