Merge "Replace UserHandle.CURRENT with UserTracker"