Merge commit '3f1bf7d06732b0e9507fde5be680cf673bd30944' * commit '3f1bf7d06732b0e9507fde5be680cf673bd30944': Track search KeyEvents in SearchDialog.
Merge commit '3f1bf7d06732b0e9507fde5be680cf673bd30944' * commit '3f1bf7d06732b0e9507fde5be680cf673bd30944': Track search KeyEvents in SearchDialog.