am a17c5bac: am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev * commit 'a17c5bac': Use realActivity as indicator for task locking