Merge "Update the 'is valid contentIntent' check" into tm-dev