Merge non-kiosk code and kiosk code. [Fixes #63623068]