Added support for MultiWindow