Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev