Merge "Add a divider between the roots selector and files list." into mnc-dev