Merge "Rename isKeepApplicationEnabledSetting API"