Merge "System bar improvements."