Merge "Do not resume activities that were launched behind" into qt-dev