* changes:
  [automerger skipped] Add scroll chip to screenshot shelf ui am: a67e1eef -s ours
  [automerger skipped] Pull scroll request/capture code out of ScreenshotController am: f0a301fc -s ours
  [automerger skipped] Abstract screenshot actions into ActionExecutor am: f80effdd -s ours
  [automerger skipped] Create ScreenshotResult class to simplify null checks am: 431c5649 -s ours
  [automerger skipped] Apply diffs to screenshot action updates am: f1e70448 -s ours
  [automerger skipped] Provide AssistContent to ScreenshotActionsProvider. am: f13c08bc -s ours
  [automerger skipped] Clean up ScreenshotController am: cff501c8 -s ours
  [automerger skipped] Implement screenshot smart actions with new action provider am: d6ca56b2 -s ours
  [automerger skipped] Handle pending actions within screenshot action provider am: c5aac9cc -s ours