Merge "Adding debug logging to track down missing app icons"