Merge ""Fix" issue #112467931: APR: WTF in ActivityManager:..." into qt-dev
am: 88917458a0

Change-Id: I512c7594a369a5ba92cfad0caad2cc17209ed03d