Merge "Set default hidden API policy to dark+black"