Merge "Actually store gravity in ActionBar.LayoutParams constructor"