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

Change-Id: I8e393c8d81fed0dca811e3aa3781978809fdb5a9