Merge "Disambiguate top focus related log message"