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

Change-Id: Idefb4b0e28a11eb62811b329be062ce813bb2eb5