Merge "checking if outline provider is null to handle rare NPE" into tm-qpr-dev