Merge "Switch to SystemUI dimen for notification margins."