Merge "Settings app supports location settings injection" into klp-dev