Change login screen to resemble android
Merge remote-tracking branch 'origin/rc2' into rc2