Merge "Don't flip action bar main content and tabs"