Merge "Fix location QuickSettings bug"