[automerger] Merge "Make default boot into user and last active user settable." into pi-dev am: 7fe1d624cf am: 6a267d0cb9

Change-Id: Id0efceb761f50a41fa080b71cfb244d53e185e0c