Merge "Enabling clipping on task views."