[Android] URBNG-435

It seems bug has been already fixed. I made two minor changes so it would look like UX user flow.