am abed2cad: Merge "Remove cancel button from display- and sort-order dialogs."

* commit 'abed2cadde0fae8e146275f40c5bc45d297d7a21':
  Remove cancel button from display- and sort-order dialogs.