Revert "Floating window (1/2)"

This reverts commit 9759f500e07815f278fdc00dbf1f5d4a9de19e7e.

Change-Id: I6227a69b4f6a07e8458b144f19b8cb6c703f1610
Merge "Revert "Floating window (1/2)"" into jb3
Merge remote-tracking branch 'upstream/jb3' into jb3