Merge "InputVerifier: verify button events and states (attempt 2)" into main