[automerger] Defer some work until after workspace fade-in am: 2917a8bf2b

Change-Id: Ibd5f3343a58158376576853b139a8dd3e5b98e26