Merge "ussd user input UI fix"