Merge "Allow session to be in foreground if active and in allowed state" into main