Merge "Make sure we post setLayerType() calls from AnimationListeners" into mnc-dev