Revert "Completely remove ExtractActionMode - master cherrypick"

This reverts commit 00245473dbdf5469ad40d1ca6d2f53a87462efcb.

Change-Id: If078c09fbdfd00d005ff58d543f03601b96eef0a
82 files changed