fix tablet issue LEVIHLYVID-37
tablet fix
tablet fix
Merge branch 'dev-richard' into tablet