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