Merge \"Unblock \'am start -W\' if activity is brought to front without launching\" into nyc-dev
am: 75c7cc6ca9

Change-Id: I97a3841d4862d7b8b4972d32fd43d8e99a7aacff