Fix focus problems when using optimized fragment transactions. am: 0bb3f19c91
am: 84aaafe705

Change-Id: I7d7fb57327497248c002ed49b8a047e1c644ea1d