Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev