You don't need to change code, you already made a mess with
Code:
If GetDeviceLayoutValues.ApproximateScreenSize < 6 Then
as you will get
false result on probably 10%-20% android devices.
Use original code, as original code is in use last two years in app with over 500k active installation, without any problem.