Merge "Fix focus problems when using optimized fragment transactions."