Merge "Bug fixes, UI flow improvements."