Simplify the mechanism of the pending activity and dialog am: 35309b0e5e am: 2c2c64a75c
am: 8646fb22f9

Change-Id: Ib4d676a367a7a8275b19d95281ee66a57ad67e33