Do not show workflow selector twice

Change-Id: Ibb312a95225906aad8945b31a2bb89f9e2060548
Merge "Do not show workflow selector twice"