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

Change-Id: Ic716fa7b64f767f5cc0d05b153756be7339244cc