Merge pull request #3563 from mbrubeck/app2

Move windowing code out of compositor, take 2. r=larsberg