Merge "APM: uid-device affinity: fix for multiple concurrent apps" into qt-dev