Merge "appcompat Fix keyboard tests for TV" into nyc-support-25.1-dev