Merge "Fix action bar background not wide enough on tablets" into oc-dev