Merge "Fix per app GPS power usage." into pi-dev