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