Merge "Fix sub status of LocationSettings" into tm-dev