Merge "Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items"