Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb