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

Change-Id: Ib34389e8b2695c7c8f96c6933e09bf15fc30ef07