Merge "Delay changing state of added fragments until all executed." into nyc-support-25.2-dev
am: 7d5431b665

Change-Id: I6599cfd13da30361f31e3944405e8d6f6b823981