Merge "Increase interval threshold below which we just leave the GPS on." into jb-dev