am ed31bbf6: Clean up some edge cases in the compat mode UI:

* commit 'ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
  Clean up some edge cases in the compat mode UI: