Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev