Merge "System bar tweaks" into honeycomb