Launch welcome screen when triggering login screen

Change-Id: Iba5f3da43ca80bab428e2163797ad1e238cd3862
Remove temporary scaffolding

Change-Id: I0dd7af59a32db19e0341fe0b2a4509a0b2c06653