Merge "Grant location to default launcher" into oc-mr1-dev