Merge "Move apex-update-allowed check"