Merge "Fix One handed mode Settings "Pull screen into reach" function fail" into tm-dev