Merge "Do not resume activities that were launched behind" into qt-dev
am: 35885e0769

Change-Id: Ia94bd35304d3062148085d76cd333c5f99a1adfc