Merge "Resume swipe up when notification shade is opened" into pi-dev
am: 0c664986ac

Change-Id: I5cd37990352e37360a773544adba26e4ff280401