Merge "Fix addGpsStatusListener"