Merge "Use a constant value (derived from MAX_BUBBLES) for elevation."