Merge "Consolidate add/remove GNSS data listeners code in LMS"