Merge "Fix bug in KeyButtonView key injection logic. Bug: 5299191 Bug: 5300282"