Merge "Shorten safe mode timer in VCN test mode" into sc-dev