Merge "Properly respect divider settings for TableLayout" into jb-mr1-dev