Merge "Fix location ignore settings bugs"