Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev