Merge "Make stop complete notification call in to ActivityManager blocking."