Merge "Allow the dismiss target size to be overridden" into tm-qpr-dev