Complete the logic around last active user, including:
am: f4339b8cb1

Change-Id: I668e6274ac8e80b7364fd0f7f860fa21addad15d