Merge "Set the decay timer for all forked apps." into oc-dev