Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev