Merge "Action bar layout tweaks"