Merge "Clearing binder identity before getting the current User" into main