Merge commit '43630806bbe4dab6509fe825938ce28b0b4b76c8' into kraken * commit '43630806bbe4dab6509fe825938ce28b0b4b76c8': Fix 2527411: Remove unusable display timeouts from Settings.
Merge commit '43630806bbe4dab6509fe825938ce28b0b4b76c8' into kraken * commit '43630806bbe4dab6509fe825938ce28b0b4b76c8': Fix 2527411: Remove unusable display timeouts from Settings.