Merge "Improve layout of ExpiryInputWidget on mobile"