Merge "Incremental system bar improvements."