Merge "Move the majority of lockIcon touch handling out of NSWVC" into main