Merge "Update LockTaskTest with new API call and behaviour changes" into mnc-dev