Merge "Fix the issue of control panel missing"