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

Change-Id: I850e2ee9568826d998f1f2882227446f7650e3b1