Merge "Fix the issue that renderEngine bails out too early."