Merge "Fix location settings status" into sc-dev