Merge "Camera2: add UI option to on/off longshot"