Reworked indicator handling and new wingpanel branch