am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev

* commit '6ff07c418ff171296e763a6658fe4b7f49e12871':
  Fix padding in user type selection dialog