Merge change 7353

* changes:
  Implement virtual button support.