Merge "Using newer object animators for click feedback animation. (3384873)" into honeycomb