Merge "Guard clipboard overlay logging method" into tm-qpr-dev