Merge "Fix bug 5211053 - use actionBarItemBackground for overflow"