Merge "Do not allow app to start background activity after stop app switches triggered" into qt-dev am: 02d9b9c3
am: 6185893d

Change-Id: I13c5c45b5af1143242de9a9dd20e5aee6d6c0361