am 3f332c3c: am 4693cb54: Merge "Make sure we post setLayerType() calls from AnimationListeners" into mnc-dev

* commit '3f332c3cf135e671c7d7e78c32a8e94596639ad7':
  Make sure we post setLayerType() calls from AnimationListeners