Merge \"Make lid switch edge rather than level triggered.\" into nyc-dev
am: e85da2bc2e

Change-Id: Iba2a0acf6901f3b7b1d1d3bea6053ad6e2aea7db