Merge "Add option to toggle validation of signed image"