Merge "Separates current process user and foreground user" into pi-dev