Merge "Move NIC binding to CollapsedStatusBarFragment" into main