Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
am: 49c0bab8bf

Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99