Merge "Quick change to unblock launching freeform from overview" into tm-qpr-dev