Merge Task level of window hierarchy (58/n)

Bug: 80414790
Fixes: 143491035
Test: Existing tests pass
Change-Id: I1b39a70afce86f9807ee7b257e10b7e9d6b6e95b
32 files changed