Merge "Do not update calling pid/uid if the task cannot be relinquished" into sc-dev