Merge branch 'bug/JAL-360+JAL-3975_keyboard_input_lost_after_dialog' into develop