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

Change-Id: I5fe058f76e3a7061fc78fe02294f0cd802534cde