Merge "Back open-close animation with an AnimatorSet." into udc-qpr-dev