Merge "Redesign zen visual effects screens" into pi-dev
am: ea360d687d

Change-Id: I416a1265f129825d91475ba63c30f02ec37adb52