am 3f511aaf: am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1

* commit '3f511aaf1cb9dfa69e2f4225a5bd41bec0864cc7':
  Discard framebuffer rendering queues when discarding layers Bug #5581817