Merge "Disable buildLayer crash"