am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb

* commit 'da910fd5ea024f214f806d880d86d77bf94497b5':
  Handle ActivityNotFoundException in the WM policy.