Merge "Fix empty stacks leaked after blocking background activity launches." into qt-dev
am: 9291a5af50

Change-Id: Ifa24664b7139aa679ab3fb415f01e8b3a227ce14