Merge "Disable zen rule preferences with invalid activities" into tm-qpr-dev