Merge "Fix padding in user type selection dialog" into lmp-mr1-dev