Merge "Fix bug 5258435 - ActionBar.setBackgroundDrawable"