NXP-15373: Update bubblebox layout