Merge "Re-enable form if 'Publish and Submit' fails to submit" into stable