Merge "Update TAPL object hierarchy in preparation for Taskbar TAPL tests"