Merge "use ifContentScrolls in the windowshade"