Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1