Merge "Keep track of user_setup_complete in DPMS" into lmp-dev