Merge "Fix regression in adding recents input consumer leading to ANR" into rvc-dev am: c4ea03559a

Change-Id: Ia1e677a9819f8cc5ee0466a84068a9aa91556eb6