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

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