Merge "Synchronise access to topRunningActivity" into tm-qpr-dev