Merge "Decouple DividerView from SystemUI"