Merge "Avoid NPE when logging the entry point to Settings"