rearrange id injection for signed apps (bug 875533)