More fixes after simplification

- Properly clip vertically, taking into account the title bar.
- Clip (again) when top-level window is resized.

Change-Id: I450810bf1337176e4ea142764333d55809834dcb