Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken