Merge commit '8cdf4d92ec93b7ba1ea6d7aaf3540283edfc6925' * commit '8cdf4d92ec93b7ba1ea6d7aaf3540283edfc6925': Fix focus notification
Merge commit '8cdf4d92ec93b7ba1ea6d7aaf3540283edfc6925' * commit '8cdf4d92ec93b7ba1ea6d7aaf3540283edfc6925': Fix focus notification