Merge "Do not propagate always-on-top config to child containers" into tm-dev