Merge "Add a wrapper Activity to launch scanning settings" into pi-dev