Merge "rename heads up global setting: app part"