Merge "Fix focus problems when using optimized fragment transactions." into nyc-support-25.1-dev
am: 639bc5a180

Change-Id: Ia86d47073c5c2501e1cc4fec8f73c27f77d8586e