Merge "Use realActivity as indicator for task locking" into mnc-dev