Merge "add a setting for the heads up: base part"