Merge "Consider app switch state for real caller." into main