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

Change-Id: I3005868cd6224b567eb52eaa2eebebb71091c49f