Merge "Let createSetStateAnimator return null when needed" into tm-qpr-dev