Merge "Restore opaque alpha value when AlphaAnimation finishes" into jb-dev