Merge "Add DisplayCapability::DISPLAY_DECORATION"