Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
am: 75bf81458e

Change-Id: If636be95a72d30ef643b66add737f77c5cbdf8d9