am 731e0331: am e70fbe8b: am 02b95105: fix transitions from hwc to GLES composition

* commit '731e0331eb402ec4564b69eaeb8b605a8b800b1b':
  fix transitions from hwc to GLES composition