Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev