Merge "KeyMaster 4.0 VTS: fix GSI detection" into sc-dev