Merge "Fixes a bug for uninitialized frame buffers"