Merge "Add logs to track focus changes"