TABLET - Poll fix change for Android, Windows
PHONE - Poll fix change for Android and Windows