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

Change-Id: Ifd866c6957b3cd9cfdb979c76b42396d57984943