Multi-window support

Change-Id: Ie5860c2105ad9c971157b41d65f8fab337461ef6