Merge "Separates logic from Chip. Chip is notch-aware."