CLSN-1691 Test gkeyvalue screen and if screen not working properly fix it