Merge changes from topic "swipe-up-gesture-overlay" into pi-dev

* changes:
  Imports com.android.settings.R to fix build breakage
  Adds two overlay settings fields for Swipe Up gesture