Merge changes I8e5f02c8,I03503c57

* changes:
  Bug 442693 - Added tests
  Bug 442693 - Added decorators to "Advanced Information" when dumping UI tree