Merge "Ensure authentication lifecycle ends for callers" into sc-dev