Merge "Fix for GPS engines without separate session and engine status events."