Merge "Merge "Handle null left and right tab strip drawables" into oc-mr1-dev am: 286c7db342 am: 7dbf5b032b"