Merge "Fix the esr-gui docker start issue."