Merge "Making some ActivityManager API calls synchronous"