Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev