Merge "Set the decay timer for all forked apps." am: 232ce7868d
am: 241fb2fc53

Change-Id: I1e27ac03777f99cc3e71935fcdfb7ea10d5bfbf4