Merge "Remove layer from window handle since it's no longer used"