Revert "Bug 982033 - change layout manager instantiate place to solve app_window dependency" to resolve test bustage

This reverts commit 5b499bc5ffbc4fe62d90154dc0d3233bcf30ddd0.