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

Change-Id: I42fbcfcf6073722656cc9186f83c3fee6bbc2777