Merge "Use res value for max bubbles & elevation"