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

Change-Id: Ia488801e92b3707c84024814fe240b5f2c3f9666