Merge "Align Settings and SystemUI packageName references"