Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev