Merge "Make screenshot/clipboard dismiss faster" into tm-dev