Merge "Skip initializing unused system bar painter" into main