Merge "Don't use incorrect inputconsumers during recents animation" into tm-dev