Merge "Normalize user active logic across Location APIs"