Merge changes I99e25471,I1a4f8876

* changes:
  Display only current InputConnection call data in Winscope
  Add more information on the Hierarchy side in Winscope