Merge "Update secondary task menu check to explicitly check for phone" into tm-qpr-dev