Merge "Remove restriction for "Use location..."" into sc-dev