Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817"