Merge "Allow developer settings to query gsid status"