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

Change-Id: I1d0b523dc23e80dea91e5586214437548384bf38