Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev