Merge "Fix some action bar menu layout bugs around config changes"