Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am: 723e5afa9e" into nyc-mr1-dev