Merge "Add configurable behavior for short press of the settings button." into main