Merge branch 'bug_618_fix_display_recording_indication'