Merge "Remove UserTracker dependency from SecureSettings&co" into main