Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev