Merge "Fix GPS settings change listener in LocManager" into jb-mr1-dev