Merge "Allow Background Location Access for Shell"