Merge "fix "am start -W" hang on activity start" into nyc-dev