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

Change-Id: I02b33fde201ad2a32b2cd91116c807e61c00ea60