Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev