Merge "Show confirmation dialog when adding user from QS" into lmp-dev