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

Change-Id: I4ba6773e2cb3fb8070b1406abbbab4fa2f56f2e4