Merge "Move the "whitelist type" constants to PowerWhitelistManager." into sc-dev