Merge "Add an action to launch scanning settings" into pi-dev
am: 4af3d1a4a4

Change-Id: I8e15c04b225ceb2792a2ca2d41c405922c02e482