Merge "DO NOT MERGE Make stop complete notification call in to ActivityManager blocking." into pi-dev