Merge "Handling concurrent location & SV status update"