Merge "Add static preview images to gesture settings." into nyc-mr1-dev
am: ec5314f2f5

Change-Id: Ib195aa98f9838ceffc27255e34b18e2bdfbccbff