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

Change-Id: Ia072115fb3233c50bc1729ad782e342677909dd2