VRP: fix xstream reference + 25customer_suboptimal proof + button insets
(cherry picked from commit 3895324a85f78279934b9ac5add5d5e288eb842e)