Merge "Avoid double logging for app overlay"