Merge "Fix bug 5971117 - Action bar does not update icon used for collapsible action views"