Merge "Fix manage menu after theme change" into main