Make clipping also properly clip its child windows

Change-Id: I23fb927258add41aea597991ff5f5b67b0691cf7