Merge "Adding zen duration preference" into pi-dev