Merge "Fix bug 4903822 - vertical gravity bugs in action bar custom views"