Merge "Make device owner user command foreground"