Merge "Fix UI issue in LocationSettings"