Merge "Text & layout tweaks in system bar:" into honeycomb