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

Change-Id: Ibb828b3d7314ecb25ec4c8a09458e57faa3574eb