Merge "Fix bug 5121406 - ActionBar.setLogo"