Merge "Modify sample streaming app to use state change reason"