merge gps changes

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>