Merge "Fix dismiss all clipping for tablet / landscape" into nyc-dev