Merge "Using zen duration preference" into pi-dev