Merge "Non-framework location access visibility and control (framework2)"