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