am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad

* commit 'ef4dccf65c1077b8c7f28c26c9c2038c975fd94c':
  Workaround to disable swiping for SRI during capture