Merge "Fix One-handed mode tutorial broken on large screen device" into tm-dev