Merge "Fixed focus recovery failure on API 15" into nyc-support-25.1-dev
am: d3f073510e

Change-Id: I708914ca775f8f5377d8ad0ca2152e0c47107406