Replace Name Environment and Choose distro screen

Updated for 6.0

Change-Id: Iecc85e2cc46c3b7ae757b9f380bc7ac030bec062
Merge "Replace Name Environment and Choose distro screen"