Merge "Add callbacks for bouncer keyguard reset" into sc-dev