* commit '2cfb873c9f0b56f2c7d694a21c968511223933af': Revert "Discard framebuffer rendering queues when discarding layers"