Merge "Remove AppWindowContainerController and AppWindowContainerListener (39/n)"