[US131] We now use our patched Settings app for 2.3.7.