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

Change-Id: I9d4fd38bdfa3c605583436cda9f331148113d551