Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev