Merge "Fix deferring making activities active"