Merge "Unify current session in vibrator service" into main