Merge "configs: lahaina: Add support for SVA5 plus other updates"