am 27f889d0: am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI:

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