Revert "[WIP] Multi-window"

This reverts commit affec3d1111b508bbaeb507a379f69191a076557.

Change-Id: Idf3bedd1d6e435c796f7e9efc9478372c52d0d7f