[automerger skipped] Merge "DO NOT MERGE Always show custom zen vis eff...
[automerger skipped] Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev am: 8e27fc75
am: 65251dd8 -s ours
Change-Id: I382ed93f60e5c31f96cde9c68bad7792d952a2df