Merge "Adds overlay field for Swipe Up gesture's default opt-in value" into pi-dev am: cac60f9290
am: a79cb2ad12

Change-Id: I53d0ea7f78b3f371e96d2ca9f342c647a5a52434