am 3b0c2eb0: Merge "Avoid NPE when logging the entry point to Settings"

* commit '3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94':
  Avoid NPE when logging the entry point to Settings