Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev