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

Change-Id: Ie152811b2de678c1785af61375a79a728616b034