Merge "Handle null left and right tab strip drawables" into oc-mr1-dev