[automerger skipped] Merge changes from topic "swipe-up-gesture-overlay" into pi-dev am: 3167f72961
am: 85833473e1  -s ours

Change-Id: Iee0dd7da6b06856f2ed73fb0ed1efb10d127acc1