DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395
am: c2ca17711e

Change-Id: Ie33341632ddce8ba2a5704598c272360584cd209