Merge "Fix InputConsumer for RecentsAnimationController may access null pointer"