Merge "Enable -Wconversion in BufferStateLayer."