Attempt to go back to thevery original finding a matching framebuffer logic
Merge pull request #4399 from raven02/patch-11

Attempt to go back to the earliest logic of finding a matching framebuffer